diff --git a/src/controls/QskAbstractButton.cpp b/src/controls/QskAbstractButton.cpp
index c89e9d01..c215fc0e 100644
--- a/src/controls/QskAbstractButton.cpp
+++ b/src/controls/QskAbstractButton.cpp
@@ -10,15 +10,11 @@
 
 #include <qbasictimer.h>
 
-// Flat/Checkable are no states - we need to get rid of them. TODO ...
+// Flat is no state - we need to get rid of it. TODO ...
 QSK_SYSTEM_STATE( QskAbstractButton, Flat, QskAspect::FirstSystemState << 1 )
 
-#if 1
-// Wrong: we are overlapping with the user states, TODO ...
-QSK_STATE( QskAbstractButton, Checked, QskAspect::LastUserState )
-#endif
-
-QSK_SYSTEM_STATE( QskAbstractButton, Pressed, QskAspect::LastSystemState >> 3 )
+QSK_SYSTEM_STATE( QskAbstractButton, Checked, QskAspect::LastSystemState >> 3 )
+QSK_SYSTEM_STATE( QskAbstractButton, Pressed, QskAspect::LastSystemState >> 2 )
 
 static QskAbstractButton* qskCheckedSibling( const QskAbstractButton* button )
 {