Subject: BUGFIX #20

Description: